[None][fix] Apply MSA patch in place so it lands regardless of wheel build#16822
Merged
pcicotti merged 1 commit intoJul 24, 2026
Merged
Conversation
brb-nv
requested review from
PerkzZheng,
QiJune,
mzweilz,
niukuo,
schetlur-nv and
yunruis
July 24, 2026 03:19
brb-nv
requested review from
pcicotti,
peihu-nv and
zheyuf
and removed request for
a team,
PerkzZheng,
QiJune,
mzweilz,
niukuo,
schetlur-nv and
yunruis
July 24, 2026 03:20
…build The downstream MSA patch was staged and applied only inside the wheel-build branch of build_wheel.py, so -s (skip wheel) and editable installs never got it, and the runtime importer (which prepends 3rdparty/MSA/python to sys.path) used the unpatched submodule anyway. Apply the patch in place on the 3rdparty/MSA submodule right after submodule init, guarded by a git-apply reverse-check for idempotency, so every consumer sees the patched fmha_sm100 sources. Drop the TRTLLM_MSA_PACKAGE_DIR env-var handoff and the build-dir staging copy. Also add a fail-fast runtime guard in msa_utils.require_msa_module: on first import it verifies the loaded fmha_sm100 carries the patch symbol and otherwise raises an actionable error naming the loaded module file. Signed-off-by: Balaram Buddharaju <169953907+brb-nv@users.noreply.github.com>
brb-nv
force-pushed
the
user/brb/always-apply-patch
branch
from
July 24, 2026 03:39
a03a427 to
1b3af35
Compare
pcicotti
approved these changes
Jul 24, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description
The downstream MSA patch was staged and applied only inside the wheel-build branch of build_wheel.py, so -s (skip wheel) and editable installs never got it, and the runtime importer (which prepends 3rdparty/MSA/python to sys.path) used the unpatched submodule anyway.
Apply the patch in place on the 3rdparty/MSA submodule right after submodule init, guarded by a git-apply reverse-check for idempotency, so every consumer sees the patched fmha_sm100 sources. Drop the TRTLLM_MSA_PACKAGE_DIR env-var handoff and the build-dir staging copy.
Also add a fail-fast runtime guard in msa_utils.require_msa_module: on first import it verifies the loaded fmha_sm100 carries the patch symbol and otherwise raises an actionable error naming the loaded module file.
Test Coverage
N/A
PR Checklist
Please review the following before submitting your PR:
PR description clearly explains what and why. If using CodeRabbit's summary, please make sure it makes sense.
PR Follows TRT-LLM CODING GUIDELINES to the best of your knowledge.
Test cases are provided for new code paths (see test instructions)
If PR introduces API changes, an appropriate PR label is added - either
api-compatibleorapi-breaking. Forapi-breaking, includeBREAKINGin the PR title.Any new dependencies have been scanned for license and vulnerabilities
CODEOWNERS updated if ownership changes
Documentation updated as needed
Update tava architecture diagram if there is a significant design change in PR.
The reviewers assigned automatically/manually are appropriate for the PR.
Please check this after reviewing the above items as appropriate for this PR.
GitHub Bot Help
To see a list of available CI bot commands, please comment
/bot help.